Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 12 Feb 2011 05:15:47 +0000 (21:15 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 12 Feb 2011 05:15:47 +0000 (21:15 -0800)
commit6fbe69594379101d900071e25195dd804b92df9c
tree3d76fc73973292595253116c0625e471833e05a1
parent26d0f968d95fee90911d269241c7ae16f39e6e1e
parentbe5bfdee66f687d78b9a1a28e36aa5d9ce12e608
Merge from mainline.
src/ChangeLog